Merge commit 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Wed, 5 Aug 2009 22:32:39 +0000 (00:32 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Wed, 5 Aug 2009 22:32:39 +0000 (00:32 +0200)
commit3c06ab6609a68a2e7966f74c7f0acae654b11238
tree225cd493cc912b3d6ae814f48f643b637f0c33ba
parent16cc2f1c4d582c846ce5ce768a1645ba0568abca
parent4aad39031381a1b2d6fa71d62fbc55a706c27142
Merge commit 'origin/upstream-cvs' into upstream